From: Greg Kroah-Hartman Date: Tue, 22 Apr 2014 17:08:40 +0000 (-0700) Subject: Merge 3.15-rc2 into staging-next X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~6168^2~39^2~1357 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/%22bookmarks:/?a=commitdiff_plain;h=3eb9992caff10b62cf0ed0bcb1667a58b13188fa;p=linux-4.9.git Merge 3.15-rc2 into staging-next This resolves a bunch of merge errors with other fixes that are already in Linus's tree. Signed-off-by: Greg Kroah-Hartman --- 3eb9992caff10b62cf0ed0bcb1667a58b13188fa